From 9a96bf893dbd185459b9b42f5bed2cb688a935de Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Fri, 16 Sep 2005 19:11:39 +0000 Subject: [PATCH] Use "vcpu" when referring to vcpus. Signed-off-by: Christian Limpach --- tools/python/xen/xend/XendDomain.py | 2 +- tools/python/xen/xend/XendDomainInfo.py | 8 ++++---- tools/python/xen/xend/XendRoot.py | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index ba588146ea..5cf5fda6be 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/tools/python/xen/xend/XendDomain.py @@ -155,7 +155,7 @@ class XendDomain: if not dom0: dom0 = self.domain_unknown(0) dom0.dom0_init_store() - dom0.dom0_enforce_cpus() + dom0.dom0_enforce_vcpus() def close(self): pass diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 40f822afd8..5c26e11375 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -1120,13 +1120,13 @@ class XendDomainInfo: # get run-time value of vcpus and update store self.configure_vcpus(dom_get(self.domid)['vcpus']) - def dom0_enforce_cpus(self): + def dom0_enforce_vcpus(self): dom = 0 - # get max number of cpus to use for dom0 from config + # get max number of vcpus to use for dom0 from config from xen.xend import XendRoot xroot = XendRoot.instance() - target = int(xroot.get_dom0_cpus()) - log.debug("number of cpus to use is %d" % (target)) + target = int(xroot.get_dom0_vcpus()) + log.debug("number of vcpus to use is %d" % (target)) # target = 0 means use all processors if target > 0: diff --git a/tools/python/xen/xend/XendRoot.py b/tools/python/xen/xend/XendRoot.py index 279dd14622..2306f0d31f 100644 --- a/tools/python/xen/xend/XendRoot.py +++ b/tools/python/xen/xend/XendRoot.py @@ -87,7 +87,7 @@ class XendRoot: dom0_min_mem_default = '0' - dom0_cpus_default = '0' + dom0_vcpus_default = '0' components = {} @@ -332,8 +332,8 @@ class XendRoot: def get_dom0_min_mem(self): return self.get_config_int('dom0-min-mem', self.dom0_min_mem_default) - def get_dom0_cpus(self): - return self.get_config_int('dom0-cpus', self.dom0_cpus_default) + def get_dom0_vcpus(self): + return self.get_config_int('dom0-cpus', self.dom0_vcpus_default) def instance(): """Get an instance of XendRoot. -- 2.30.2